Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "upstream merge 22/9" #1892

Merged
merged 1 commit into from
Sep 22, 2024
Merged

Revert "upstream merge 22/9" #1892

merged 1 commit into from
Sep 22, 2024

Conversation

deltanedas
Copy link
Member

squashed it so going to not squash this time :trollface:

@deltanedas deltanedas requested review from a team and IamVelcroboy as code owners September 22, 2024 11:49
@deltanedas deltanedas merged commit 06e8f15 into master Sep 22, 2024
16 checks passed
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Map Changes: UI Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Documentation Changes any xml or md files Changes: Sprite Changes any png or json in an rsi Changes: Audio Changes any audio files labels Sep 22, 2024
@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit 8231e82 merging into e20fa39
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-psychologist Modified
paper_stamp-greytide Removed

Resources/Textures/Decals/burnt.rsi

State Old New Status
burnt1 Removed
burnt2 Removed
burnt3 Removed
burnt4 Removed

Resources/Textures/Mobs/Customization/gauze.rsi

State Old New Status
gauze_head Removed

Resources/Textures/Mobs/Pets/corgi.rsi

State Old New Status
real_mouse Removed
real_mouse_dead Removed

Resources/Textures/Objects/Devices/encryption_keys.rsi

State Old New Status
borg_label Removed

Resources/Textures/Objects/Fun/toys.rsi

State Old New Status
rubber_chicken Removed

Resources/Textures/Objects/Misc/stamps.rsi

State Old New Status
stamp-greytide Removed
stamp-psychologist Removed

Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi

State Old New Status
dead Removed
harvest Removed
produce Removed
seed Removed
stage-1 Removed
stage-2 Removed

Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi

State Old New Status
broken Removed
deny-unshaded Removed
normal-unshaded Removed
off Removed
panel Removed

Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi

State Old New Status
bluespace Removed
bluespace_VOX Removed

Resources/Textures/DeltaV/Objects/Misc/stamps.rsi

State Old New Status
stamp-psychologist Added

@MilonPL MilonPL deleted the revert-1891-upstream-ops branch October 4, 2024 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IamVelcroboy IamVelcroboy Awaiting requested review from IamVelcroboy

Assignees
No one assigned
Labels
Changes: Audio Changes any audio files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@deltanedas